Getting rid of some TODOs & warnings