Some stuff / Fixed