Merged minor changes