New fixes for Boilerplate. Will package soon