Fixes that were needed