Fixed asset upload issue and several small bugfixes