Fixed upload problem etc...