Solved some problems between 135-329

135-329 problems

Signed-off-by: Paul McQuade <paulmcquad@gmail.com>