Minor fixes and improvements (0.3.4)