Some minior issues fixed