Fixes to conversion from PHP