Minor Error Fixes