Fix uncompress bugs