Fixed some things?