more fixes for everyone