Minor fixes, lowered debug messages etc.