Fixes for final issues