Minor fixes all things working