Fixes for previous compilation errors