Minor fixes and updates (no big fuss)