Fixes at jk0's request.