Last cleanup, small bugfix with cd warning message