V0.10 development minor bugfixes

Heya,

These are some minor fixes for my mistakes.

Please review and merge, thanks!