Additional changes/bug fixes