strict fixes, debug cleanup