Fixed stuff
Merged from master