last minute "fixes"