Fixed things and problems