Fixes for errors and modified dates