Cleanup: fixing compiler warnings