Bug fixes for custompad