Temporary "fixes"