More stupid mistakes fix..