Some bug fixes for acme