Minor fixes
Too many changes. Lost track.