some other quick fixes