Close GH-6: Some fixes :D.