Last Minute Fixes for 0.12

These are some fixes improvements which could and probably should go into 0.12