Minor change in optimizer and trainable