Few fixes to prepare for initial release