Random fixes

Need to sort these out later