Various fixes for Button() calls