Fix for a couple build errors