Issue fixes & improvements