Fixes for latest stable build