Some bugs to resolve