[203] --> Misc fixes... (Thx FireEmerald)