Fixes for 1.8 syntax