Fixed resetting/building behaviour in various places