Some fixes, TODO