Some style fixes and disable relationship target for now