Fixed stuff for 1.4.7