Made some final fixes