Minor fixes in total