Cleanup and debug message adaptions