Fixes, better handling of things