J!3.3 compatibility fixes