Fixing final issues