few more bug fixes from launch pad