Minor changes, fixed update crash