orm fixes