1.5.4 - Minor corrections