Temporary bug fixes