Further fixes & cleanup

SSIA.