Fixes and more!