last minutes fixes