Supermarine production WW1

Can anyone help with these two photos, both are of aircraft built by Pemberton Billing/Supermarine in WW1
The first looks like the tail of a Short 184 but the reg 1017, assuming this is a Navy number, was allocated to a Sopwith Baby.
The second I do not recognise. The reg. 1580, again if it is Navy, should be a Short 184, but the shape of the rudder is wrong.
Any ideas?