Minor fixes / improvements