Fix bugs with this and that