Fixed things left unfinished