Minor fixes

Version Pre-Alpha 0.6.4