Last Minute Adjustments

last minute adjustments

Signed-off-by: Michael Frohberg <michael.frohberg@gmail.com>