[Fix] Small handling fixes, nothing special.