Even more fixes and waiting