Cleanup

Two small cleanup patches, please apply.