I'm going to go ahead and close this as the original issue has been taken care of and the second issue is now found in Bug #192796.
I'm going to go ahead and close this as the original issue has been taken care of and the second issue is now found in Bug #192796.