Few fixes (forgot to commit, forgot what I have changed) ;)