Style Fixes and others.