Moreeeeee fixes