proximity fix and others

Change-Id: I8fedd6b39668d37352991526eec4c1189c8546d4