More fixes ...

Signed-off-by: Graham Chiu <compkarori@gmail.com>