Small fixes; Mainly to time/uncompress