Some fixes, #time