Fixes for 30threlease