Sorted out more issues