some fixes for things that was broked