Adjusted to 1.9.2+

Some tiny improvements for 1.9.2+