Few more fixes!

One day it will be perfect... oh well!