Out logging and other changes