Both problems should be solved, thanks for reporting