Initial Fixes

Signed-off-by: unknown <jhernandez@EWJUST.ECMC.local>