Minor fixes and code updates.