Some fixes / cleanups.