Minor changes to court views, fix bugs in debug