Quick fixes, relates to #205 #217