Merge again with fixes...