Fixed or worked around some issues