Some stuff fixed