Couple of Warning and Error Fixes