Cleanup due to fixed compiler errors