Fancy Things 

These are some fixes we found.