More Lobster fixes