Cleanup: fixed some warnings