Bug fixes hopefully...