Small updates.

See: http://particular.myjetbrains.com/youtrack/issue/INSTL-17

A part of the changes were already made by John.