Final (hopefully) fixes