A few final fixes