Fixed minor form bugs