Some fixes to the reported problems, can I be more vague?