Minor changes. Still need to fix tests!