Preliminary 14.12 bugfixes and cleanup

Change-Id: I209dd1b3761922034bc78b4710ebb30902f85340
Signed-off-by: Meggan Ehret <meggan@qeo.org>