More framework ports and bug fixes