Fixes for some things that were buggy in 2.08 first version