Minor fixes

Version Pre-Alpha 0.7.3