Some fixes.

Summary: T1

Test Plan: testing...

Reviewers: teppo

Reviewed By: teppo

Differential Revision: http://wunder.sytes.net:81/D3