Misc final changes