Minor fixes, checking output