couple fixes on prev commit