Fix logging and mouse handler due to last minute refactor