A few more bigfixes