Fixes for the final additions