Fix some issues;