Access buttons on import. Also fixes #528