Minor Fixes/Optimisations to previous Commit