Second fixes

Second fixes