fix some load time issues

Signed-off-by: Chris Granger <ibdknox@gmail.com>