Updating changes to include some things I missed.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Drop L5 support for now. Will be worked on later.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>