A couple of stupid fixes :)