Fixing some problems I created with the last commit