OASIS fixes and improvements