Runtime issues

Fixed runtime issues