003 - A couple more fixes