Fixed FIXMEs and added bonus trick.