Quick space fixes