Fixes for Andres