More syntactical fixes for compatibility