Fixed compile issue
Small changes
Helper scripts