Small fixes / improvements