Minor fixes to move to actual use