Fixed some broked stuff