Fixed small bugs with object interactions