Fix bugs from last weeks merges
Fix bugs from last weeks merges