Fixes from bug list