Aditional sanity checks and cosmetic changes