Some final changes to fix support for 1.5.2

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>