Button related fixes