Misc final fixes