some temporary bug fixes