Fixed things that went wrong