Fixed stuff for newest version