Fixed stuff for the 1.1