Slight cleanup
Small fixes