Adding mication bug fixes and others