Cleanup & small fixes