Some additional fixes for recent model

Signed-off-by: Rob Adams <readams@readams.net>