Fix potential compatiblity issues