Fixed all the nag