Minor fixes, should work now :)