Fixed some more focus