fix few more issues, the whole suite is working now