Sorted some issues.