fixes for first run and ARM architecture