Fixed other stuff