Minor fixes to prepare first launch