Fixes for the classic build mode
Classic build seems operational