Fixes, removed dependencies, etc