fix various bugs - #72

Bugbot Analysis Progress (5m 9s elapsed)

✅ Gathered PR context (2s)
✅ Completed bug detection (5m 7s)
✅ Posted analysis results (1s)

Final Result: Bugbot completed review - no issues found! ✅

Request ID: serverGenReqId_7e8c412e-28c0-4d6c-aa18-42b166ce7395