Fixed some buggy interactions