Small fixes / improvements.