Random bug fixes, etc