Fix a few undefined object/var notices