Made fixes.