v5.1.5 small cross-browser build fixes