Little updates, fixes, cleanups