Even more fixes #2