Fix filename resolution and fix /update