more fixes xD