Some post 0.8 ALPHA fixes.