FIX: A few issues

I found while porting features over to Firefox ;)