Some stupid bug fixes..