Sorted out some '/' issues