Fixes for Start point and another Warnings