Fix bugs and try to temporize things a little