Dropped old compatibility code
Fixed 5.3 compatibility